time: Do not overflow to signal value #5710
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Hocuri
reviewed
May 23, 2023
Hocuri
added a commit
to deltachat/deltachat-core-rust
that referenced
this pull request
May 23, 2023
This might not be needed after all because of tokio-rs/tokio#5710, but since I already wrote the code, I created a PR anyway.
Erk-
force-pushed
the
fix/far-out-in-the-future-but-not-too-far
branch
from
de05c50
to
009614c
Compare
Durations far into the future would cause the conversion of millis from u128 to u64 to fail and set the value to u64::MAX. This in turn causes issues since u64::MAX is used as a signal value. This patch adds a new constant that is the largest non-signal value that can be used for ticks. And uses that in the location it causes issues.
Erk-
force-pushed
the
fix/far-out-in-the-future-but-not-too-far
branch
from
009614c
to
48cdd43
Compare
Simon-Laux
approved these changes
May 23, 2023
Darksonn
reviewed
Jun 10, 2023
Erk-
force-pushed
the
fix/far-out-in-the-future-but-not-too-far
branch
from
bb0e8ed
to
0015c26
Compare
Darksonn
reviewed
Jun 10, 2023
tokio/tests/time_sleep.rs
Outdated
| let big = std::time::Duration::from_secs(u64::MAX / 10); | ||
| // This is a workaround since awaiting sleep(big) will never finish. | ||
| tokio::select! { | ||
| biased; |
There was a problem hiding this comment.
Suggested change
| biased; | |
| biased; |
There was a problem hiding this comment.
I had it like that at first, but rustfmt disagree with it, so I have skipped the expression now.
There was a problem hiding this comment.
Huh? Rustfmt usually does not format macros. Can you try and remove the skip annotation to see if our CI fails it?
There was a problem hiding this comment.
It did hence the force push above, here is the specific run of the CI
https://github.com/tokio-rs/tokio/actions/runs/5229606790/jobs/9442690852
crapStone
pushed a commit
to Calciumdibromid/CaBr2
that referenced
this pull request
Jul 6, 2023
This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [tokio](https://tokio.rs) ([source](https://github.com/tokio-rs/tokio)) | dependencies | minor | `1.28.2` -> `1.29.1` | | [tokio](https://tokio.rs) ([source](https://github.com/tokio-rs/tokio)) | dev-dependencies | minor | `1.28.2` -> `1.29.1` | --- ### Release Notes <details> <summary>tokio-rs/tokio (tokio)</summary> ### [`v1.29.1`](https://github.com/tokio-rs/tokio/releases/tag/tokio-1.29.1): Tokio v1.29.1 [Compare Source](tokio-rs/tokio@tokio-1.29.0...tokio-1.29.1) ##### Fixed - rt: fix nesting two `block_in_place` with a `block_on` between (#​5837]) #​5837]: tokio-rs/tokio#5837 ### [`v1.29.0`](https://github.com/tokio-rs/tokio/releases/tag/tokio-1.29.0): Tokio v1.29.0 [Compare Source](tokio-rs/tokio@tokio-1.28.2...tokio-1.29.0) Technically a breaking change, the `Send` implementation is removed from `runtime::EnterGuard`. This change fixes a bug and should not impact most users. ##### Breaking - rt: `EnterGuard` should not be `Send` (#​5766]) ##### Fixed - fs: reduce blocking ops in `fs::read_dir` (#​5653]) - rt: fix possible starvation (#​5686], #​5712]) - rt: fix stacked borrows issue in `JoinSet` (#​5693]) - rt: panic if `EnterGuard` dropped incorrect order (#​5772]) - time: do not overflow to signal value (#​5710]) - fs: wait for in-flight ops before cloning `File` (#​5803]) ##### Changed - rt: reduce time to poll tasks scheduled from outside the runtime (#​5705], #​5720]) ##### Added - net: add uds doc alias for unix sockets (#​5659]) - rt: add metric for number of tasks (#​5628]) - sync: implement more traits for channel errors (#​5666]) - net: add nodelay methods on TcpSocket (#​5672]) - sync: add `broadcast::Receiver::blocking_recv` (#​5690]) - process: add `raw_arg` method to `Command` (#​5704]) - io: support PRIORITY epoll events (#​5566]) - task: add `JoinSet::poll_join_next` (#​5721]) - net: add support for Redox OS (#​5790]) ##### Unstable - rt: add the ability to dump task backtraces (#​5608], #​5676], #​5708], #​5717]) - rt: instrument task poll times with a histogram (#​5685]) #​5766]: tokio-rs/tokio#5766 #​5653]: tokio-rs/tokio#5653 #​5686]: tokio-rs/tokio#5686 #​5712]: tokio-rs/tokio#5712 #​5693]: tokio-rs/tokio#5693 #​5772]: tokio-rs/tokio#5772 #​5710]: tokio-rs/tokio#5710 #​5803]: tokio-rs/tokio#5803 #​5705]: tokio-rs/tokio#5705 #​5720]: tokio-rs/tokio#5720 #​5659]: tokio-rs/tokio#5659 #​5628]: tokio-rs/tokio#5628 #​5666]: tokio-rs/tokio#5666 #​5672]: tokio-rs/tokio#5672 #​5690]: tokio-rs/tokio#5690 #​5704]: tokio-rs/tokio#5704 #​5566]: tokio-rs/tokio#5566 #​5721]: tokio-rs/tokio#5721 #​5790]: tokio-rs/tokio#5790 #​5608]: tokio-rs/tokio#5608 #​5676]: tokio-rs/tokio#5676 #​5708]: tokio-rs/tokio#5708 #​5717]: tokio-rs/tokio#5717 #​5685]: tokio-rs/tokio#5685 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi4wLjAiLCJ1cGRhdGVkSW5WZXIiOiIzNi4wLjAiLCJ0YXJnZXRCcmFuY2giOiJkZXZlbG9wIn0=--> Co-authored-by: cabr2-bot <cabr2.help@gmail.com> Reviewed-on: https://codeberg.org/Calciumdibromid/CaBr2/pulls/1958 Reviewed-by: crapStone <crapstone01@gmail.com> Co-authored-by: Calciumdibromid Bot <cabr2_bot@noreply.codeberg.org> Co-committed-by: Calciumdibromid Bot <cabr2_bot@noreply.codeberg.org>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
As described in #5183, Tokio will panic if you sleep far, but not too far into the future.
This can cause issues and crashes in some cases where you don't expect it which is the main motivation for solving it.
Solution
The issue is that the time value will overflow and then get set to
u64::MAX,u64::MAXis also used as the signal value for the stateSTATE_DEREGISTEREDwhich will cause thewhenfunction to think that the time already have fired and thus been deregistered.If the program is run in debug mode it will fail a bit earlier because of a
debug_assertIssue with this PR
This PR will currently never complete CI since the test I have added fails to ever complete. I am not sure how that should be resolved so I have opened this PR to discuss it as well. Should it be commented out or can it be made to work instead.